feat: CalendarCache - filter generic calendars from subscription batch#7
Conversation
Add filtering to SelectedCalendarRepository.findNextSubscriptionBatch to exclude generic calendars (holidays, contacts, shared, imported, resources) based on their externalId suffixes. Changes: - Add GENERIC_CALENDAR_SUFFIXES constant mapping providers to their generic calendar suffixes in AdaptersFactory - Add getGenericCalendarSuffixes method to AdapterFactory interface - Update findNextSubscriptionBatch to accept and use genericCalendarSuffixes parameter to filter out calendars with matching externalId suffixes - Update CalendarSubscriptionService.checkForNewSubscriptions to pass generic calendar suffixes from the adapter factory - Update tests to cover the new filtering logic Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com>
Code Review by Qodo
1. Repository filename/class mismatch
|
![qodo-code-review[bot]](https://avatars.githubusercontent.com/in/484649?s=60&v=4){kind=small}
| import type { Prisma } from "@calcom/prisma/client"; | ||
|
|
||
| export class SelectedCalendarRepository implements ISelectedCalendarRepository { | ||
| export class PrismaSelectedCalendarRepository implements ISelectedCalendarRepository { |
There was a problem hiding this comment.
1. Repository filename/class mismatch 📘 Rule violation ✓ Correctness
• The repository file is named SelectedCalendarRepository.ts but now exports PrismaSelectedCalendarRepository, violating the required Prisma<Entity>Repository filename/class convention. • This reduces consistency/discoverability and can confuse imports and code search for the canonical repository implementation.
Agent prompt
## Issue description
`PrismaSelectedCalendarRepository` is exported from `SelectedCalendarRepository.ts`, but repositories must follow the `Prisma<Entity>Repository.ts` naming convention with filename matching the exported class name.
## Issue Context
This violates the repository naming convention and can reduce discoverability and consistency across the codebase.
## Fix Focus Areas
- packages/features/selectedCalendar/repositories/SelectedCalendarRepository.ts[1-6]
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
Comment on lines
19
to
30
| take, | ||
| teamIds, | ||
| integrations, | ||
| genericCalendarSuffixes, | ||
| }: { | ||
| take: number; | ||
| teamIds: number[]; | ||
| integrations: string[]; | ||
| genericCalendarSuffixes?: string[]; | ||
| }) { | ||
| return this.prismaClient.selectedCalendar.findMany({ | ||
| where: { |
There was a problem hiding this comment.
2. Integrations optional mismatch 🐞 Bug ⛯ Reliability
• ISelectedCalendarRepository.findNextSubscriptionBatch declares integrations as optional, but the Prisma implementation requires it and uses it unguarded. • If any caller omits integrations (allowed by the interface), Prisma will receive in: undefined and likely throw at runtime. • This is also a contract mismatch between interface and implementation that invites future bugs.
Agent prompt
### Issue description
`integrations` is optional in `ISelectedCalendarRepository.findNextSubscriptionBatch`, but the Prisma implementation requires it and uses it directly in `integration: { in: integrations }`. If a caller omits `integrations` (which the interface allows), this can cause a Prisma validation/runtime error.
### Issue Context
This PR adds another optional filter (`genericCalendarSuffixes`) and handles it defensively, making the lack of defensive handling for `integrations` more inconsistent and risky.
### Fix Focus Areas
- packages/features/selectedCalendar/repositories/SelectedCalendarRepository.interface.ts[26-36]
- packages/features/selectedCalendar/repositories/SelectedCalendarRepository.ts[18-33]
### Suggested fix options
- Option A: Make `integrations` required in the interface (and update any callers/tests accordingly).
- Option B (more flexible): Keep it optional and update implementation:
- Use `integration: integrations?.length ? { in: integrations } : undefined` (or conditionally spread the filter) so Prisma doesn't receive `in: undefined`.
- Decide expected behavior when `integrations` is omitted (e.g., return all integrations vs. return none).
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Benchmark PR from agentic-review-benchmarks#7